Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update noresm_develop to noresm2_3_develop changes for oslo_aero #128

Merged
merged 17 commits into from
Feb 23, 2024
Merged

update noresm_develop to noresm2_3_develop changes for oslo_aero #128

merged 17 commits into from
Feb 23, 2024

Conversation

mvertens
Copy link

@mvertens mvertens commented Jan 28, 2024 •
edited by gold2718
Loading

update noresm develop to noresm2 3 develop changes for oslo_aero

Summary:

  1. External for oslo_aero (particularly oslo_aero/src) is very close to the noresm2_3_develop version
  2. External for camnor_phys has been updated to be consistent with 1.
  3. AEROCOM has now been introduced as an xml variable.
  4. Changes to outfld calls in the following have been made consistent with noresm2_3_develop and noresm2_1_develop
src/physics/cam/cam_diagnostics.F90
src/physics/cam/convect_shallow.F90
src/physics/cam/ndrop_bam.F90
src/physics/cam/vertical_diffusion.F90
  1. NF1850tropmam4 and NF1850oslo now refer to the following compsets:
NF1850tropmam4: 1850_CAM%DEV%LT%NORESM%TROPMAM4_CLM51%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV
NF1850oslo: 1850_CAM%DEV%LT%NORESM%CAMoslo_CLM51%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV

Contributors: mvertens

Reviewers: gold2718

Purpose of changes: To bring in noresm2_3_develop updates into noresm_develop in order to start coupled model simulations. #130

Github PR URL: #128

Changes made to build system:

  • CAM_AEROCOM is now an xml variable

Changes made to the namelist: New use cases for NF1850oslo and NF1850

Changes to the defaults for the boundary datasets: None (other than those coming in from the use cases)

Substantial timing or memory changes: None (although this has not been checked)

Testing:
The sandbox used was noresm2_5_alpha01 with the updated CAM. This has a different CLM external than
the current head of noresm_develop for CAM. So all baseline comparisons failed. It would be helpful to include an aquaplanet test for these PRs so that we can verify baseline diffs for some cases regardless of the CLM tag that is present in the CAM externals.

Ran updated aux_cam_noresm tests on betzy - which now has the following testlist and status.
ERP_D_Ln9_P18.ne3pg3_ne3pg3_mg37.NFLTHISToslo_v0d.betzy_intel.cam-outfrq9s (Overall: PASS) details:
ERP_D_Ln9_P256.f19_f19_mtn14.F1850.betzy_intel.cam-outfrq9s (Overall: PASS) details:
ERP_D_Ln9_P36.f10_f10_mg37.F2000climo.betzy_intel.cam-outfrq9s (Overall: PASS) details:
ERP_D_Ln9_P36.ne3pg3_ne3pg3_mg37.FLTHIST_v0d.betzy_intel.cam-outfrq9s (Overall: PASS) details:
ERP_D_Ln9_P36.ne3pg3_ne3pg3_mg37.NFLTHISTghgmam4_v0d.betzy_intel.cam-outfrq9s (Overall: PASS) details:
ERP_Ln9.ne30pg3_ne30pg3_mtn14.NF1850oslo.betzy_intel.cam-outfrq9s (Overall: PASS) details:
ERP_Ln9.ne30pg3_ne30pg3_mtn14.NF1850tropmam4.betzy_intel.cam-outfrq9s (Overall: PASS) details:
ERP_Ln9.ne30pg3_ne30pg3_mtn14.NF2000oslo.betzy_intel.cam-outfrq9s (Overall: PASS) details:
ERP_Ln9.ne30pg3_ne30pg3_mtn14.NF2000tropmam4.betzy_intel.cam-outfrq9s (Overall: PASS) details:
SMS_D_Ln9_P18.ne3pg3_ne3pg3_mg37.NF2000oslo.betzy_intel.cam-outfrq9s (Overall: PASS) details:
SMS_D_Ln9_P256.f19_f19_mtn14.F2000climo.betzy_intel.cam-outfrq9s (Overall: PASS) details:

Generated new baselines on betzy noresm_v9_cam6_3_123.

@mvertens mvertens marked this pull request as draft January 28, 2024 19:00
@mvertens mvertens changed the title update noresm develop to noresm2 3 develop changes for oslo_aero update noresm_develop to noresm2_3_develop changes for oslo_aero Feb 5, 2024
@mvertens mvertens requested a review from gold2718 February 5, 2024 09:21
@mvertens mvertens marked this pull request as ready for review February 5, 2024 09:30
gold2718
gold2718 approved these changes Feb 19, 2024
View reviewed changes
Copy link

@gold2718 gold2718 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall looks good but I'm in favor of more cleanup and less commented out code and XML entries (see questions).
Also, at least one test name needs to change.

Externals_CAM.cfg Outdated Show resolved Hide resolved
bld/namelist_files/use_cases/1850_cam_lt_noresm.xml Outdated Show resolved Hide resolved
cime_config/config_compsets.xml Outdated Show resolved Hide resolved
cime_config/config_pes.xml Outdated Show resolved Hide resolved
cime_config/config_pes.xml Show resolved Hide resolved
cime_config/testdefs/testlist_cam.xml Outdated Show resolved Hide resolved
cime_config/testdefs/testlist_cam.xml Outdated Show resolved Hide resolved
@mvertens mvertens requested a review from gold2718 February 19, 2024 19:08
@gold2718 gold2718 added the enhancement New feature or request label Feb 20, 2024
@gold2718 gold2718 added this to the NorESM2.5 milestone Feb 20, 2024
gold2718
gold2718 requested changes Feb 21, 2024
View reviewed changes
Copy link

@gold2718 gold2718 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still think some cleanup is necessary.

Externals_CAM.cfg Outdated Show resolved Hide resolved
Externals_CAM.cfg Outdated Show resolved Hide resolved
Externals_CAM.cfg Outdated Show resolved Hide resolved
bld/configure Outdated Show resolved Hide resolved
bld/configure Outdated Show resolved Hide resolved
cime_config/config_compsets.xml Outdated Show resolved Hide resolved
cime_config/testdefs/testlist_cam.xml Outdated Show resolved Hide resolved
@mvertens mvertens requested a review from gold2718 February 23, 2024 08:49
gold2718
gold2718 approved these changes Feb 23, 2024
View reviewed changes
Copy link

@gold2718 gold2718 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now, thanks!

@mvertens mvertens requested a review from gold2718 February 23, 2024 08:55
@mvertens mvertens mentioned this pull request Feb 23, 2024
Open
@mvertens mvertens mentioned this pull request Feb 23, 2024
Merged
gold2718
gold2718 approved these changes Feb 23, 2024
View reviewed changes
Copy link

@gold2718 gold2718 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This time for sure!

@gold2718 gold2718 merged commit 824a3ec into NorESMhub:noresm_develop Feb 23, 2024
@mvertens mvertens deleted the feature/update_noresm_develop_to_noresm2_3_develop branch February 23, 2024 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gold2718 gold2718 gold2718 approved these changes

Assignees

@gold2718 gold2718

Labels
enhancement New feature or request
Projects
NorESM Development
Status: Done
Milestone
NorESM2.5
Development

Successfully merging this pull request may close these issues.
2 participants
@mvertens @gold2718